Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "main: Drop deprecated container-encapsulate entrypoint" #4527

Merged
merged 1 commit into from
Aug 4, 2023

Conversation

cgwalters
Copy link
Member

This reverts commit 2d07002.

It turns out that this is used by osbuild today
https://github.com/osbuild/osbuild/blob/14d31633a4b14878735ed5222befb895b16de2d1/stages/org.osbuild.ostree.encapsulate#L112

We'll do a patch to port to the new API there but let's just carry this for $time where values of $time are probably at least a year.

This reverts commit 2d07002.

It turns out that this is used by osbuild today
https://github.com/osbuild/osbuild/blob/14d31633a4b14878735ed5222befb895b16de2d1/stages/org.osbuild.ostree.encapsulate#L112

We'll do a patch to port to the new API there but let's just
carry this for $time where values of $time are probably at least
a year.
cgwalters added a commit to cgwalters/osbuild that referenced this pull request Aug 4, 2023
We have a lot of copypasta of `def ostree()` but in this
case it's actually rpm-ostree, and we should be clear about that.

(Also in the future this code will need to change
 to use the non-deprecated entrypoint, see
 coreos/rpm-ostree#4527 )
Copy link
Member

@jmarrero jmarrero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@jmarrero jmarrero merged commit 7210726 into coreos:main Aug 4, 2023
13 checks passed
ondrejbudai pushed a commit to cgwalters/osbuild that referenced this pull request Aug 5, 2023
We have a lot of copypasta of `def ostree()` but in this
case it's actually rpm-ostree, and we should be clear about that.

(Also in the future this code will need to change
 to use the non-deprecated entrypoint, see
 coreos/rpm-ostree#4527 )
supakeen pushed a commit to cgwalters/osbuild that referenced this pull request Aug 5, 2023
We have a lot of copypasta of `def ostree()` but in this
case it's actually rpm-ostree, and we should be clear about that.

(Also in the future this code will need to change
 to use the non-deprecated entrypoint, see
 coreos/rpm-ostree#4527 )
supakeen pushed a commit to osbuild/osbuild that referenced this pull request Aug 5, 2023
We have a lot of copypasta of `def ostree()` but in this
case it's actually rpm-ostree, and we should be clear about that.

(Also in the future this code will need to change
 to use the non-deprecated entrypoint, see
 coreos/rpm-ostree#4527 )
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants